auto merge of #672 : bkoropoff/cargo/option-map-cleanup, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Oct 2014 14:15:07 +0000 (14:15 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Oct 2014 14:15:07 +0000 (14:15 +0000)
This reduces syntactic noise and is a good use case for `if let`, which I turned on.


Trivial merge